gtk: Avoid GdkDrawable usage, including needless casts

diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index d9c70e5b670cc9af030ea2647bce524802d63999..1270bb05639f5877776ddaed766a514c3af2b472 100644 (file)
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -692,7 +692,7 @@ check_hex (GtkIMContextSimple *context_simple,
 static void
 beep_window (GdkWindow *window)
 {
-  GdkScreen *screen = gdk_window_get_screen (GDK_DRAWABLE (window));
+  GdkScreen *screen = gdk_window_get_screen (window);
   gboolean   beep;
 
   g_object_get (gtk_settings_get_for_screen (screen),

diff --git a/gtk/gtkimmodule.c b/gtk/gtkimmodule.c
index 788631d2ee7081dcc266c2a39bcf7f2179ed946f..868cfe17c2381847e5aeda04f122a1994cc3c324 100644 (file)
--- a/gtk/gtkimmodule.c
+++ b/gtk/gtkimmodule.c
@@ -681,9 +681,9 @@ _gtk_im_module_get_default_context_id (GdkWindow *client_window)
 
   /* Check if the certain immodule is set in XSETTINGS.
    */
-  if (GDK_IS_DRAWABLE (client_window))
+  if (GDK_IS_WINDOW (client_window))
     {
-      screen = gdk_window_get_screen (GDK_DRAWABLE (client_window));
+      screen = gdk_window_get_screen (client_window);
       settings = gtk_settings_get_for_screen (screen);
       g_object_get (G_OBJECT (settings), "gtk-im-module", &tmp, NULL);
       if (tmp)

diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c
index a8357babfe5ad187401120997a5911eba8ebd3e2..f2454fcb4afe746bafab3267c3eb5cdd3018a16e 100644 (file)
--- a/gtk/gtkimmulticontext.c
+++ b/gtk/gtkimmulticontext.c
@@ -297,7 +297,7 @@ gtk_im_multicontext_set_client_window (GtkIMContext *context,
 
   if (window)
     {
-      screen = gdk_window_get_screen (GDK_DRAWABLE (window));
+      screen = gdk_window_get_screen (window);
       settings = gtk_settings_get_for_screen (screen);
 
       connected = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (settings),